Check for nm.

2005-04-29  Matthias Clasen  <mclasen@redhat.com>

	* configure.in: Check for nm.

	* gtk/Makefile.am: Use $(NM), not nm directly. (#301299,
	Nguyen Thai Ngoc Duy)

diff --git a/ChangeLog b/ChangeLog
index 86c1443e677276cf340e71eb041305d1cc62c692..3db85f626c2f9199d1e2bf0ac4817ed61e3dca30 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-04-29  Matthias Clasen  <mclasen@redhat.com>
 
+       * configure.in: Check for nm.
+
+       * gtk/Makefile.am: Use $(NM), not nm directly. (#301299, 
+       Nguyen Thai Ngoc Duy)
+
        * gtk/gtkiconview.c (gtk_icon_view_move_cursor_start_end): Use
        the internal unselect_all function, since we need the unselection
        to happen even in browse mode.  (#300995, Mathias Hasselmann)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 86c1443e677276cf340e71eb041305d1cc62c692..3db85f626c2f9199d1e2bf0ac4817ed61e3dca30 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,10 @@
 2005-04-29  Matthias Clasen  <mclasen@redhat.com>
 
+       * configure.in: Check for nm.
+
+       * gtk/Makefile.am: Use $(NM), not nm directly. (#301299, 
+       Nguyen Thai Ngoc Duy)
+
        * gtk/gtkiconview.c (gtk_icon_view_move_cursor_start_end): Use
        the internal unselect_all function, since we need the unselection
        to happen even in browse mode.  (#300995, Mathias Hasselmann)

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 86c1443e677276cf340e71eb041305d1cc62c692..3db85f626c2f9199d1e2bf0ac4817ed61e3dca30 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,10 @@
 2005-04-29  Matthias Clasen  <mclasen@redhat.com>
 
+       * configure.in: Check for nm.
+
+       * gtk/Makefile.am: Use $(NM), not nm directly. (#301299, 
+       Nguyen Thai Ngoc Duy)
+
        * gtk/gtkiconview.c (gtk_icon_view_move_cursor_start_end): Use
        the internal unselect_all function, since we need the unselection
        to happen even in browse mode.  (#300995, Mathias Hasselmann)

diff --git a/configure.in b/configure.in
index 69ab1860a11f1f92a724337dbd083a5d55564b24..fb613fe07c28e63a4c84fdc24e4b9ffd101aeabc 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -152,6 +152,7 @@ AM_PROG_LIBTOOL
 AC_SYS_LARGEFILE
 
 AM_PROG_AS
+AC_PATH_PROG(NM, nm, nm)
 
 dnl Initialize maintainer mode
 AM_MAINTAINER_MODE

diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index 9837974c9921ea649c20d31f763d4f219fcfd1fc..3dccc1d2f15c70e881e7ec4a6f5de55bc896e0cb 100644 (file)
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -19,8 +19,8 @@ install-libtool-import-lib:
 #      (Unfortunately the GNU linker doesn't yet understand the PRIVATE
 #      directive in .def files.)
        for entry in `grep PRIVATE gdk_pixbuf.def | sed -e 's/PRIVATE//'`; do \
-         file=`nm -A .libs/libgdk_pixbuf-$(GTK_API_VERSION).dll.a | tr -d '\r' | grep -E $$entry'$$' | head -n 1 | cut -d: -f2`; \
-         ar d .libs/libgdk_pixbuf-$(GTK_API_VERSION).dll.a $$file; \
+         file=`$(NM) -A .libs/libgdk_pixbuf-$(GTK_API_VERSION).dll.a | tr -d '\r' | grep -E $$entry'$$' | head -n 1 | cut -d: -f2`; \
+         $(AR) d .libs/libgdk_pixbuf-$(GTK_API_VERSION).dll.a $$file; \
        done
        $(INSTALL) .libs/libgdk_pixbuf-$(GTK_API_VERSION).dll.a $(DESTDIR)$(libdir)
 uninstall-libtool-import-lib:

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index a509c247a633fb4feed16adf00fceda691abc4b3..3110424f85db128e0a87f5bb86d15fa88e44dc73 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -47,8 +47,8 @@ gtk-win32res.lo : gtk-win32.rc
 
 install-libtool-import-lib:
        for entry in `grep PRIVATE gtk.def | sed -e 's/PRIVATE//'`; do \
-         file=`nm -A .libs/libgtk-win32-$(GTK_API_VERSION).dll.a | tr -d '\r' | grep -E $$entry'$$' | head -n 1 | cut -d: -f2`; \
-         ar d .libs/libgtk-win32-$(GTK_API_VERSION).dll.a $$file; \
+         file=`$(NM) -A .libs/libgtk-win32-$(GTK_API_VERSION).dll.a | tr -d '\r' | grep -E $$entry'$$' | head -n 1 | cut -d: -f2`; \
+         $(AR) d .libs/libgtk-win32-$(GTK_API_VERSION).dll.a $$file; \
        done
        $(INSTALL) .libs/libgtk-win32-$(GTK_API_VERSION).dll.a $(DESTDIR)$(libdir)
 uninstall-libtool-import-lib: